Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 04:43:39 +0000 (04:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 04:43:39 +0000 (04:43 +0000)
commit70ded81b2315d661b12d23387855232b1a7957e4
tree5c21f5441d23a80de60bdb5f12f6416df1ca53a5
parented39ae5f7501de750ac8c7645612c98b864521f9
parentafc52db4ee41b3c3d6813cf9a82bc4c4bf558f4b
Merge from mainline.